From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 19 Sep 2012 04:38:26 +0000 (-0300)
Subject: autorunManager: Clean up mount operations
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5680
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7e496b1979e9891d2d0c987f7ca9818b4e99d5de;p=gnome-shell.git

autorunManager: Clean up mount operations

Add a processMount function that's shared between mount scanning
and hotplug.

https://bugzilla.gnome.org/show_bug.cgi?id=684093
---

diff --git a/js/ui/components/autorunManager.js b/js/ui/components/autorunManager.js
index 541c75ca7..942576ad3 100644
--- a/js/ui/components/autorunManager.js
+++ b/js/ui/components/autorunManager.js
@@ -175,16 +175,21 @@ const AutorunManager = new Lang.Class({
         this._volumeMonitor.disconnect(this._mountRemovedId);
     },
 
+    _processMount: function(mount, hotplug) {
+        let discoverer = new ContentTypeDiscoverer(Lang.bind(this, function(mount, apps, contentTypes) {
+            this._ensureResidentSource();
+            this._residentSource.addMount(mount, apps);
+
+            if (hotplug)
+                this._transDispatcher.addMount(mount, apps, contentTypes);
+        }));
+        discoverer.guessContentTypes(mount);
+    },
+
     _scanMounts: function() {
         let mounts = this._volumeMonitor.get_mounts();
-        mounts.forEach(Lang.bind(this, function (mount) {
-            let discoverer = new ContentTypeDiscoverer(Lang.bind (this, 
-                function (mount, apps) {
-                    this._ensureResidentSource();
-                    this._residentSource.addMount(mount, apps);
-                }));
-
-            discoverer.guessContentTypes(mount);
+        mounts.forEach(Lang.bind(this, function(mount) {
+            this._processMount(mount, false);
         }));
     },
 
@@ -194,14 +199,7 @@ const AutorunManager = new Lang.Class({
         if (!this._loginManager.sessionActive)
             return;
 
-        let discoverer = new ContentTypeDiscoverer(Lang.bind (this,
-            function (mount, apps, contentTypes) {
-                this._transDispatcher.addMount(mount, apps, contentTypes);
-                this._ensureResidentSource();
-                this._residentSource.addMount(mount, apps);
-            }));
-
-        discoverer.guessContentTypes(mount);
+        this._processMount(mount, true);
     },
 
     _onMountRemoved: function(monitor, mount) {